Upgrade to ExtJS 3.0.3 - Released 10/11/2009

[extjs.git] / docs / source / templates.html (Case Conflict 1)
diff --git a/docs/source/templates.html (Case Conflict 1) b/docs/source/templates.html (Case Conflict 1)

deleted file mode 100644 (file)

index fcaa25b..0000000
--- a/docs/source/templates.html (Case Conflict 1)
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>\r
-<head>\r
-  <title>The source code</title>\r
-    <link href="../resources/prettify/prettify.css" type="text/css" rel="stylesheet" />\r
-    <script type="text/javascript" src="../resources/prettify/prettify.js"></script>\r
-</head>\r
-<body  onload="prettyPrint();">\r
-    <pre class="prettyprint lang-js">// In AIR, XTemplates must be created at load time\r
-Templates = {\r
-       categoryCombo: new Ext.XTemplate(\r
-               '<tpl for="."><div class="x-combo-list-item">{listName}</div></tpl>'\r
-       ),\r
-       timeField: new Ext.XTemplate(\r
-               '<tpl for="."><div class="x-combo-list-item">{text}</div></tpl>'\r
-       ),\r
-\r
-       gridHeader : new Ext.Template(\r
-        '<table border="0" cellspacing="0" cellpadding="0" style="{tstyle}">',\r
-        '<thead><tr class="x-grid3-hd-row">{cells}</tr></thead>',\r
-        '<tbody><tr class="new-task-row">',\r
-            '<td><div id="new-task-icon"></div></td>',\r
-            '<td><div class="x-small-editor" id="new-task-title"></div></td>',\r
-            '<td><div class="x-small-editor" id="new-task-cat"></div></td>',\r
-            '<td><div class="x-small-editor" id="new-task-due"></div></td>',\r
-        '</tr></tbody>',\r
-        "</table>"\r
-    )\r
-};\r
-</pre>    \r
-</body>\r
-</html>
-\ No newline at end of file